From d922877f6e7629f81642e94959d4cddf485a009a Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 30 Nov 2009 10:58:23 +0000
Subject: [PATCH] ia64: eliminate build warnings

Various warnings appeared since 3.4 - eliminate at least some of them.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
---
 xen/arch/ia64/linux-xen/unwind.c       | 2 +-
 xen/arch/ia64/xen/mm.c                 | 1 +
 xen/common/tmem_xen.c                  | 1 +
 xen/drivers/passthrough/vtd/ia64/ats.c | 8 ++------
 xen/include/asm-ia64/hvm/support.h     | 5 +++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/xen/arch/ia64/linux-xen/unwind.c b/xen/arch/ia64/linux-xen/unwind.c
index 7d41eb6fbb..469c3bbc1f 100644
--- a/xen/arch/ia64/linux-xen/unwind.c
+++ b/xen/arch/ia64/linux-xen/unwind.c
@@ -38,7 +38,7 @@
 // work around
 // write_trylock() does bug check, but stack unwinder can be called
 // subtle situation, so skip bug check.
-#undef write_trylock(lock)
+#undef write_trylock
 #ifdef CONFIG_SMP
 #define write_trylock(lock)	_raw_write_trylock(lock)
 #else
diff --git a/xen/arch/ia64/xen/mm.c b/xen/arch/ia64/xen/mm.c
index d2031dc10e..6fcdece762 100644
--- a/xen/arch/ia64/xen/mm.c
+++ b/xen/arch/ia64/xen/mm.c
@@ -2875,6 +2875,7 @@ donate_page(struct domain *d, struct page_info *page, unsigned int memflags)
 {
     /* needs to be implemented for transcendent memory (tmem) */
     ASSERT(0);
+    return -ENOSYS;
 }
 
 static void
diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c
index 12e67f3464..950c9c03da 100644
--- a/xen/common/tmem_xen.c
+++ b/xen/common/tmem_xen.c
@@ -84,6 +84,7 @@ void tmh_copy_page(char *to, char*from)
 static inline void *cli_mfn_to_va(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn)
 {
     ASSERT(0);
+    return NULL;
 }
 #define paging_mark_dirty(_x,_y) do {} while(0)
 #else
diff --git a/xen/drivers/passthrough/vtd/ia64/ats.c b/xen/drivers/passthrough/vtd/ia64/ats.c
index 0591888ebc..6f0541fbf7 100644
--- a/xen/drivers/passthrough/vtd/ia64/ats.c
+++ b/xen/drivers/passthrough/vtd/ia64/ats.c
@@ -28,6 +28,8 @@
 #include "../vtd.h"
 #include "../extern.h"
 
+struct pci_ats_dev;
+
 int ats_enabled = 0;
 
 struct acpi_drhd_unit * find_ats_dev_drhd(struct iommu *iommu)
@@ -45,12 +47,6 @@ int enable_ats_device(int seg, int bus, int devfn)
     return 0;
 }        
 
-static int device_in_domain(struct iommu *iommu,
-                            struct pci_ats_dev *pdev, u16 did)
-{
-    return 0;
-}
-
 int dev_invalidate_iotlb(struct iommu *iommu, u16 did,
     u64 addr, unsigned int size_order, u64 type)
 {
diff --git a/xen/include/asm-ia64/hvm/support.h b/xen/include/asm-ia64/hvm/support.h
index 399378e40e..fcbd3d2cb6 100644
--- a/xen/include/asm-ia64/hvm/support.h
+++ b/xen/include/asm-ia64/hvm/support.h
@@ -25,13 +25,14 @@
 
 #include <xen/hvm/save.h>
 
-static int hvm_girq_dest_2_vcpu_id(struct domain *d, uint8_t dest,
+static inline int hvm_girq_dest_2_vcpu_id(struct domain *d, uint8_t dest,
                                 uint8_t dest_mode)
 {
     /* TODO */
+    return -ENOSYS;
 }
 
-static void hvm_migrate_pirqs(struct vcpu *v)
+static inline void hvm_migrate_pirqs(struct vcpu *v)
 {
     /* TODO */
 }
-- 
2.30.2